Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: snapshotter's failure is not propogated (backport #16588) #16603

Merged
merged 3 commits into from
Jun 19, 2023
Merged

fix: snapshotter's failure is not propogated (backport #16588) #16603

merged 3 commits into from
Jun 19, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 17, 2023

This is an automatic backport of pull request #16588 done by Mergify.
Cherry-pick of aeccbc9 has failed:

On branch mergify/bp/release/v0.47.x/pr-16588
Your branch is up to date with 'origin/release/v0.47.x'.

You are currently cherry-picking commit aeccbc910.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   snapshots/chunk.go
	modified:   snapshots/helpers_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   snapshots/manager_test.go
	deleted by us:   store/CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@yihuang @mergify
fix: snapshotter's failure is not propogated (#16588)
9775afc 
(cherry picked from commit aeccbc9)

# Conflicts:
#	snapshots/manager_test.go
#	store/CHANGELOG.md
@mergify mergify bot requested a review from a team as a code owner June 17, 2023 14:53
@mergify mergify bot added the conflicts label Jun 17, 2023
@github-actions github-actions bot removed the C:Store label Jun 19, 2023
@yihuang yihuang removed the conflicts label Jun 19, 2023
@tac0turtle tac0turtle merged commit 40c4daf into release/v0.47.x Jun 19, 2023
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.47.x/pr-16588 branch June 19, 2023 07:44
@0xstepit 0xstepit mentioned this pull request Jul 1, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tac0turtle tac0turtle tac0turtle approved these changes

@alexanderbez alexanderbez alexanderbez approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@alexanderbez @tac0turtle @yihuang